From dbbf403175d56806bd084b5e69b6eecefd6a5873 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Tue, 7 Aug 2007 06:58:15 +0000
Subject: [PATCH] Look for expat in macports and source-installed locations. 
 Via Scot Hacker.

---
 configure    | 21 +++++++++++++++++++++
 configure.in | 13 +++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/configure b/configure
index d51b46141..c9152e91b 100755
--- a/configure
+++ b/configure
@@ -4339,6 +4339,7 @@ else
 	case "$target" in
 	*-*-darwin*)
 		if test -f /sw/lib/libexpat.a ; then
+			# libexpat installed via fink
 			EXPAT_LIB=/sw/lib/libexpat.a
 
 cat >>confdefs.h <<\_ACEOF
@@ -4346,6 +4347,26 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
+		fi
+		if test -f /opt/local/lib/libexpat.a ; then
+			# libexpat installed via macports
+			EXPAT_LIB=/opt/local/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
+		fi
+		if test -f /usr/local/lib/libexpat.a ; then
+			# libexpat installed from source
+			EXPAT_LIB=/usr/local/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
 		fi
 		;;
 	*-*-freebsd*)
diff --git a/configure.in b/configure.in
index 8cf8cf5e9..b78e33a59 100644
--- a/configure.in
+++ b/configure.in
@@ -219,10 +219,23 @@ AC_ARG_WITH(libexpat,
 	case "$target" in
 	*-*-darwin*)
 		if test -f /sw/lib/libexpat.a ; then
+			# libexpat installed via fink
 			EXPAT_LIB=/sw/lib/libexpat.a
 			  AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
 			  AC_SUBST(EXPAT_LIB)
 		fi
+		if test -f /opt/local/lib/libexpat.a ; then
+			# libexpat installed via macports
+			EXPAT_LIB=/opt/local/lib/libexpat.a
+			  AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+			  AC_SUBST(EXPAT_LIB)
+		fi
+		if test -f /usr/local/lib/libexpat.a ; then
+			# libexpat installed from source
+			EXPAT_LIB=/usr/local/lib/libexpat.a
+			  AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+			  AC_SUBST(EXPAT_LIB)
+		fi				
 		;;
 	*-*-freebsd*)
 		if test -f /usr/local/lib/libexpat.a ; then
-- 
2.30.2